/* private */ $wgDefaultUserOptionsEn = array(
'quickbar' => 1,
'underline' => 1,
- 'hover' => 1,
'cols' => 80,
'rows' => 25,
'searchlimit' => 20,
'rcusemodstyle' => 1,
'showupdated' => 1,
'fancysig' => 0,
+ 'externaleditor' => 0,
);
/* private */ $wgQuickbarSettingsEn = array(
define( 'MW_DATE_USER_FORMAT', true );
/* private */ $wgDateFormatsEn = array(
- 'No preference',
- 'January 15, 2001',
- '15 January 2001',
- '2001 January 15',
- '2001-01-15'
+ 'Default',
+ '16:12, January 15, 2001',
+ '16:12, 15 January 2001',
+ '16:12, 2001 January 15',
+ 'ISO 8601' => '2001-01-15 16:12:34'
);
/* private */ $wgUserTogglesEn = array(
- 'hover',
'underline',
'highlightbroken',
'justify',
'shownumberswatching',
'rcusemodstyle',
'showupdated',
- 'fancysig'
+ 'fancysig',
+ 'externaleditor'
);
/* private */ $wgBookstoreListEn = array(
MAG_START => array( 0, '__START__' ),
MAG_CURRENTMONTH => array( 1, 'CURRENTMONTH' ),
MAG_CURRENTMONTHNAME => array( 1, 'CURRENTMONTHNAME' ),
+ MAG_CURRENTMONTHNAMEGEN => array( 1, 'CURRENTMONTHNAMEGEN' ),
+ MAG_CURRENTMONTHABBREV => array( 1, 'CURRENTMONTHABBREV' ),
MAG_CURRENTDAY => array( 1, 'CURRENTDAY' ),
MAG_CURRENTDAYNAME => array( 1, 'CURRENTDAYNAME' ),
MAG_CURRENTYEAR => array( 1, 'CURRENTYEAR' ),
MAG_CURRENTTIME => array( 1, 'CURRENTTIME' ),
MAG_NUMBEROFARTICLES => array( 1, 'NUMBEROFARTICLES' ),
- MAG_CURRENTMONTHNAMEGEN => array( 1, 'CURRENTMONTHNAMEGEN' ),
MAG_PAGENAME => array( 1, 'PAGENAME' ),
MAG_PAGENAMEE => array( 1, 'PAGENAMEE' ),
MAG_NAMESPACE => array( 1, 'NAMESPACE' ),
MAG_NOCONTENTCONVERT => array( 0, '__NOCONTENTCONVERT__', '__NOCC__'),
MAG_CURRENTWEEK => array( 1, 'CURRENTWEEK' ),
MAG_CURRENTDOW => array( 1, 'CURRENTDOW' ),
+ MAG_REVISIONID => array( 1, 'REVISIONID' ),
);
#-------------------------------------------------------------------
'special_version_prefix' => ' ',
'special_version_postfix' => ' ',
# User preference toggles
-'tog-hover' => 'Show hoverbox over wiki links',
'tog-underline' => 'Underline links',
'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>).',
'tog-justify' => 'Justify paragraphs',
'tog-rcusemodstyle' => 'Show recent changes in UseMod style: only the most recent change of any page is listed.',
'tog-showupdated' => 'Show update marker ',
'tog-fancysig' => 'Raw signatures (without automatic link)',
+'tog-externaleditor' => 'Use external editor by default',
# dates
'sunday' => 'Sunday',
'portal' => 'Community portal',
'portal-url' => 'Project:Community Portal',
'about' => 'About',
-"aboutsite" => "About {{SITENAME}}",
-"aboutpage" => "Project:About",
+'aboutsite' => 'About {{SITENAME}}',
+'aboutpage' => 'Project:About',
'article' => 'Content page',
'help' => 'Help',
-"helppage" => "Help:Contents",
-"wikititlesuffix" => "{{SITENAME}}",
-"bugreports" => "Bug reports",
-"bugreportspage" => "Project:Bug_reports",
+'helppage' => 'Help:Contents',
+'wikititlesuffix' => '{{SITENAME}}',
+'bugreports' => 'Bug reports',
+'bugreportspage' => 'Project:Bug_reports',
'sitesupport' => '-', # To enable, something like 'Donations',
'sitesupport-url' => 'Project:Site support',
'faq' => 'FAQ',
-"faqpage" => "Project:FAQ",
-"edithelp" => "Editing help",
-"newwindow" => "(opens in new window)",
-"edithelppage" => "Help:Editing",
+'faqpage' => 'Project:FAQ',
+'edithelp' => 'Editing help',
+'newwindow' => '(opens in new window)',
+'edithelppage' => 'Help:Editing',
'cancel' => 'Cancel',
'qbfind' => 'Find',
'qbbrowse' => 'Browse',
'edit' => 'Edit',
'editthispage' => 'Edit this page',
'delete' => 'Delete',
-"deletethispage" => "Delete this page",
-"undelete_short1" => "Undelete one edit",
-"undelete_short" => "Undelete $1 edits",
+'deletethispage' => 'Delete this page',
+'undelete_short1' => 'Undelete one edit',
+'undelete_short' => 'Undelete $1 edits',
'protect' => 'Protect',
'protectthispage' => 'Protect this page',
'unprotect' => 'Unprotect',
'savearticle' => 'Save page',
'preview' => 'Preview',
'showpreview' => 'Show preview',
+'showdiff' => 'Show changes',
'blockedtitle' => 'User is blocked',
'blockedtext' => "Your user name or IP address has been blocked by $1.
The reason given is this:<br />''$2''<p>You may contact $1 or one of the other
Legend: (cur) = difference with current version,
(last) = difference with preceding version, M = minor edit.',
'history_copyright' => '-',
+'deletedrev' => '[deleted]',
# Diffs
#
$2 List redirects Search for $3 $9",
"searchdisabled" => '<p style="margin: 1.5em 2em 1em">{{SITENAME}} search is disabled for performance reasons. You can search via Google in the meantime.
<span style="font-size: 89%; display: block; margin-left: .2em">Note that their indexes of {{SITENAME}} content may be out of date.</span></p>',
-'googlesearch' => "
-<!-- SiteSearch Google -->
-<FORM method=GET action=\"http://www.google.com/search\">
-<TABLE bgcolor=\"#FFFFFF\"><tr><td>
-<A HREF=\"http://www.google.com/\">
-<IMG SRC=\"http://www.google.com/logos/Logo_40wht.gif\"
-border=\"0\" ALT=\"Google\"></A>
-</td>
-<td>
-<INPUT TYPE=text name=q size=31 maxlength=255 value=\"$1\">
-<INPUT type=submit name=btnG VALUE=\"Google Search\">
-<font size=-1>
-<input type=hidden name=domains value=\"{{SERVER}}\"><br /><input type=radio name=sitesearch value=\"\"> WWW <input type=radio name=sitesearch value=\"{{SERVER}}\" checked> {{SERVER}} <br />
-<input type='hidden' name='ie' value='$2'>
-<input type='hidden' name='oe' value='$2'>
-</font>
-</td></tr></TABLE>
-</FORM>
-<!-- SiteSearch Google -->",
+
+'googlesearch' => '
+<div style="margin-left: 2em">
+
+<!-- Google search -->
+<div style="width:130px;float:left;text-align:center;position:relative;top:-8px"><a href="http://www.google.com/" style="padding:0;background-image:none"><img src="http://www.google.com/logos/Logo_40wht.gif" alt="Google" style="border:none" /></a></div>
+
+<form method="get" action="http://www.google.com/search" style="margin-left:135px">
+ <div>
+ <input type="hidden" name="domains" value="{{SERVER}}" />
+ <input type="hidden" name="num" value="50" />
+ <input type="hidden" name="ie" value="$2" />
+ <input type="hidden" name="oe" value="$2" />
+
+ <input type="text" name="q" size="31" maxlength="255" value="$1" />
+ <input type="submit" name="btnG" value="Google Search" />
+ </div>
+ <div style="font-size:90%">
+ <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}" checked="checked" /><label for="gwiki">{{SITENAME}}</label>
+ <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label>
+ </div>
+</form>
+
+</div>',
'blanknamespace' => '(Main)',
# Preferences page
'textboxsize' => 'Editing',
'rows' => 'Rows',
'columns' => 'Columns',
-'searchresultshead' => 'Search result settings',
+'searchresultshead' => 'Search results',
'resultsperpage' => 'Hits to show per page',
'contextlines' => 'Lines to show per hit',
'contextchars' => 'Characters of context per line',
# switching pan
'grouplevels-lookup-group' => 'Manage group rights',
-'grouplevels-group-edit' => 'Existent groups: ',
+'grouplevels-group-edit' => 'Existing groups: ',
'editgroup' => 'Edit Group',
'addgroup' => 'Add Group',
'userlevels-groupsmember' => 'Member of:',
'userlevels-groupsavailable' => 'Available groups:',
'userlevels-groupshelp' => 'Select groups you want the user to be removed from or added to.
-Unselected groups will not be changed. You can unselect a group by using CTRL + Left Click',
+Unselected groups will not be changed. You can deselect a group with CTRL + Left Click',
# Recent changes
#
'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles. Please rename the file and try uploading it again.',
'badfilename' => "Image name has been changed to \"$1\".",
'badfiletype' => "\".$1\" is not a recommended image file format.",
-'largefile' => 'It is recommended that images not exceed 100k in size.',
+'largefile' => 'It is recommended that images not exceed $1 bytes in size, this file is $2 bytes',
'emptyfile' => 'The file you uploaded seems to be empty. This might be due to a typo in the file name. Please check whether you really want to upload this file.',
'fileexists' => 'A file with this name exists already, please check $1 if you are not sure if you want to change it.',
'successfulupload' => 'Successful upload',
created and by whom, and anything else you may know about it. If this is an image, you can insert it like this: <tt><nowiki>[[Image:$1|thumb|Description]]</nowiki></tt>",
'uploadwarning' => 'Upload warning',
'savefile' => 'Save file',
-'uploadedimage' => "uploaded \"$1\"",
+'uploadedimage' => "uploaded \"[[$1]]\"",
'uploaddisabled' => 'Sorry, uploading is disabled.',
'uploadcorrupt' => 'The file is corrupt or has an incorrect extension. Please check the file and upload again.',
'ilshowmatch' => 'Show all images with names matching',
'ilsubmit' => 'Search',
'showlast' => "Show last $1 images sorted $2.",
-'all' => 'all',
'byname' => 'by name',
'bydate' => 'by date',
'bysize' => 'by size',
'maintenancebacklink' => 'Back to Maintenance Page',
'disambiguations' => 'Disambiguation pages',
'disambiguationspage' => "Project:Links_to_disambiguating_pages",
-'disambiguationstext' => "The following pages link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br />A page is treated as dismbiguation if it is linked from $1.<br />Links from other namespaces are <i>not</i> listed here.",
+'disambiguationstext' => "The following pages link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br />A page is treated as disambiguation if it is linked from $1.<br />Links from other namespaces are <i>not</i> listed here.",
'doubleredirects' => 'Double Redirects',
'doubleredirectstext' => "<b>Attention:</b> This list may contain false positives. That usually means there is additional text with links below the first #REDIRECT.<br />\nEach row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" target page, which the first redirect should point to.",
'brokenredirects' => 'Broken Redirects',
'listadmins' => 'Admins list',
'specialpages' => 'Special pages',
'spheading' => 'Special pages for all users',
+'restrictedpheading' => 'Restricted special pages',
'asksqlpheading' => 'asksql level',
'blockpheading' => 'block level',
'createaccountpheading' => 'createaccount level',
'booksources' => 'Book sources',
'categoriespagetext' => 'The following categories exist in the wiki.',
'data' => 'Data',
-'userlevels' => 'User levels management',
-'grouplevels' => 'Group levels management',
+'userlevels' => 'User rights management',
+'grouplevels' => 'User group management',
# FIXME: Other sites, of course, may have affiliate relations with the booksellers list
'booksourcetext' => "Below is a list of links to other sites that
# Special:Allpages
'nextpage' => 'Next page ($1)',
'articlenamespace' => '(articles)',
-'allpagesformtext1' => 'Display pages starting at: $1',
-'allpagesformtext2' => 'Choose namespace: $1 $2',
-'allarticles' => 'All articles',
-'allpagesprev' => 'Previous',
-'allpagesnext' => 'Next',
-'allpagesnamespace' => 'All pages ($1 namespace)',
-'allpagessubmit' => 'Go',
-
-# Email this user
+'allpagesformtext' => '
+<table border="0">
+ <tr>
+ <td align="right">Display pages starting at:</td>
+ <td align="left">$1</td>
+ </tr>
+ <tr>
+ <td align="right">Namespace:</td>
+ <td align="left">$2 $3</td>
+ </tr>
+ <tr>
+ <td align="right">$4</td>
+ <td align="left">Invert</td>
+ </tr>
+</table>',
+'allarticles' => 'All articles',
+'allnonarticles' => 'All non-articles',
+'allinnamespace' => 'All pages ($1 namespace)',
+'allnotinnamespace' => 'All pages (not in $1 namespace)',
+'allpagesprev' => 'Previous',
+'allpagesnext' => 'Next',
+'allpagessubmit' => 'Go',
+
+# E this user
#
'mailnologin' => 'No send address',
'mailnologintext' => "You must be <a href=\"{{localurl:Special:Userlogin\">logged in</a>
'removingchecked' => 'Removing requested items from watchlist...',
'couldntremove' => "Couldn't remove item '$1'...",
'iteminvalidname' => "Problem with item '$1', invalid name...",
-'wlnote' => "Below are the last $1 changes in the last <b>$2</b> hours.",
-'wlshowlast' => "Show last $1 hours $2 days $3",
-'wlsaved' => 'This is a saved version of your watchlist.',
+'wlnote' => 'Below are the last $1 changes in the last <b>$2</b> hours.',
+'wlshowlast' => 'Show last $1 hours $2 days $3',
+'wlsaved' => 'This is a saved version of your watchlist.',
+'wlhideshowown' => '$1 my edits.',
+'wlshow' => 'Show',
+'wlhide' => 'Hide',
'updatedmarker' => '<span class=\'updatedmarker\'> updated (since my last visit) </span>',
'email_notification_reset' => 'Reset all notification flags (set their status to "visited")',
'email_notification_newpagetext'=> 'This is a new page.',
'email_notification_to' => '$WATCHINGUSERNAME_QP <$WATCHINGUSEREMAILADDR>',
-'email_notification_subject' => '{{SITENAME}} page $PAGETITLE_QP has been changed by $PAGEEDITOR_QP',
+'email_notification_subject' => '{{SITENAME}} page $PAGETITLE has been changed by $PAGEEDITOR',
'email_notification_lastvisitedrevisiontext' => 'See {{SERVER}}{{localurl:$PAGETITLE_RAWURL|diff=0&oldid=$OLDID}} for all changes since your last visit.',
'email_notification_body' => 'Dear $WATCHINGUSERNAME,
'protectlogpage' => 'Protection_log',
'protectlogtext' => "Below is a list of page locks/unlocks.
See [[Project:Protected page]] for more information.",
-'protectedarticle' => "protected $1",
-'unprotectedarticle' => "unprotected $1",
+'protectedarticle' => "protected \"[[$1]]\"",
+'unprotectedarticle' => "unprotected \"[[$1]]\"",
'protectsub' =>"(Protecting \"$1\")",
'confirmprotecttext' => 'Do you really want to protect this page?',
'confirmprotect' => 'Confirm protection',
'contributions' => 'User contributions',
'mycontris' => 'My contributions',
'contribsub' => "For $1",
+'contributionsformtext' => '
+<table border="0">
+ <tr>
+ <td align="right">Namespace:</td>
+ <td align="left">$1 $2</td>
+ </tr>
+</table>',
'nocontribs' => 'No changes were found matching these criteria.',
'ucnote' => "Below are this user's last <b>$1</b> changes in the last <b>$2</b> days.",
'uclinks' => "View the last $1 changes; view the last $2 days.",
accordance with [[Project:Policy|policy]].
Fill in a specific reason below (for example, citing particular
pages that were vandalized).",
-'ipaddress' => 'IP Address/username',
+'ipaddress' => 'IP Address',
+'ipadressorusername' => 'IP Address or username',
'ipbexpiry' => 'Expiry',
'ipbreason' => 'Reason',
'ipbsubmit' => 'Block this user',
'unblockiptext' => 'Use the form below to restore write access
to a previously blocked IP address or username.',
'ipusubmit' => 'Unblock this address',
-'ipusuccess' => "\"$1\" unblocked",
+'ipusuccess' => "\"[[$1]]\" unblocked",
'ipblocklist' => 'List of blocked IP addresses and usernames',
'blocklistline' => "$1, $2 blocked $3 (expires $4)",
'blocklink' => 'block',
'contribslink' => 'contribs',
'autoblocker' => "Autoblocked because you share an IP address with \"$1\". Reason \"$2\".",
'blocklogpage' => 'Block_log',
-'blocklogentry' => 'blocked "$1" with an expiry time of $2',
+'blocklogentry' => 'blocked "[[$1]]" with an expiry time of $2',
'blocklogtext' => 'This is a log of user blocking and unblocking actions. Automatically
blocked IP addresses are not listed. See the [[Special:Ipblocklist|IP block list]] for
the list of currently operational bans and blocks.',
'proxyblocker' => 'Proxy blocker',
'proxyblockreason' => 'Your IP address has been blocked because it is an open proxy. Please contact your Internet service provider or tech support and inform them of this serious security problem.',
'proxyblocksuccess' => "Done.\n",
+'sorbs' => 'SORBS DNSBL',
+'sorbsreason' => 'Your IP address is listed as an open proxy in the [http://www.sorbs.net SORBS] DNSBL.',
+
# Developer tools
#
'user_rights_set' => "<b>User rights for \"$1\" updated</b>",
'set_rights_fail' => "<b>User rights for \"$1\" could not be set. (Did you enter the name correctly?)</b>",
'makesysop' => 'Make a user into a sysop',
+'already_sysop' => 'This user is already an administrator',
+'already_bureaucrat' => 'This user is already a bureaucrat',
# Validation
-'val_clear_old' => 'Clear my other validation data for $1',
+'val_yes' => 'Yes',
+'val_no' => 'No',
+'val_revision' => 'Revision',
+'val_time' => 'Time',
+'val_list_header' => '<th>#</th><th>Topic</th><th>Range</th><th>Action</th>',
+'val_add' => 'Add',
+'val_del' => 'Delete',
+'val_warning' => '<b>Never, <i>ever</i>, change something here without <i>explicit</i> community consensus!</b>',
+'val_rev_for' => 'Revisions for ',
+'val_rev_stats_link' => 'See the validation statistics for "$1" <a href="$2">here</a>',
+'val_iamsure' => 'Check this box if you really mean it!',
+'val_clear_old' => 'Clear my older validation data',
'val_merge_old' => 'Use my previous assessment where selected \'No opinion\'',
'val_form_note' => '<b>Hint:</b> Merging your data means that for the article
revision you select, all options where you have specified <i>no opinion</i>
'val_version_of' => "Version of $1" ,
'val_table_header' => "<tr><th>Class</th>$1<th colspan=4>Opinion</th>$1<th>Comment</th></tr>\n",
'val_stat_link_text' => 'Validation statistics for this article',
-'val_view_version' => 'View this version',
+'val_view_version' => 'View this revision',
'val_validate_version' => 'Validate this version',
'val_user_validations' => 'This user has validated $1 pages.',
'val_no_anon_validation' => 'You have to be logged in to validate an article.',
'movetalk' => 'Move "talk" page as well, if applicable.',
'talkpagemoved' => 'The corresponding talk page was also moved.',
'talkpagenotmoved' => 'The corresponding talk page was <strong>not</strong> moved.',
-'1movedto2' => "$1 moved to $2",
-'1movedto2_redir' => '$1 moved to $2 over redirect',
+'1movedto2' => "[[$1]] moved to [[$2]]",
+'1movedto2_redir' => '[[$1]] moved to [[$2]] over redirect',
'movelogpage' => 'Move log',
'movelogpagetext' => 'Below is a list of page moved.',
+'movereason' => 'Reason',
+'revertmove' => 'revert',
# Export
'accesskey-minoredit' => 'i',
'accesskey-save' => 's',
'accesskey-preview' => 'p',
+'accesskey-diff' => 'd',
'accesskey-compareselectedversions' => 'v',
# tooltip help for some actions, most are in Monobook.js
'tooltip-minoredit' => 'Mark this as a minor edit [alt-i]',
'tooltip-save' => 'Save your changes [alt-s]',
'tooltip-preview' => 'Preview your changes, please use this before saving! [alt-p]',
+'tooltip-diff' => 'Show which changes you made to the text. [alt-d]',
'tooltip-compareselectedversions' => 'See the differences between the two selected versions of this page. [alt-v]',
'tooltip-watch' => 'Add this page to your watchlist [alt-w]',
'listingcontinuesabbrev' => " cont.",
# Info page
-"infosubtitle" => "Information for page",
-"numedits" => "Number of edits (article): $1",
-"numtalkedits" => "Number of edits (discussion page): $1",
-"numwatchers" => "Number of watchers: $1",
-"numauthors" => "Number of distinct authors (article): $1",
-"numtalkauthors" => "Number of distinct authors (discussion page): $1",
+'infosubtitle' => 'Information for page',
+'numedits' => 'Number of edits (article): $1',
+'numtalkedits' => 'Number of edits (discussion page): $1',
+'numwatchers' => 'Number of watchers: $1',
+'numauthors' => 'Number of distinct authors (article): $1',
+'numtalkauthors' => 'Number of distinct authors (discussion page): $1',
# Math options
'mw_math_png' => 'Always render PNG',
'passwordtooshort' => 'Your password is too short. It must have at least $1 characters.',
+# external editor support
+'edit-externally' => 'Edit this file using an external application',
+'edit-externally-help' => 'See the [http://meta.wikimedia.org/wiki/Help:External_editors setup instructions] for more information.',
+
+# 'all' in various places, this might be different for inflicted languages
+'recentchangesall' => 'all',
+'imagelistall' => 'all',
+'watchlistall1' => 'all',
+'watchlistall2' => 'all',
+'contributionsall' => 'all',
);
#--------------------------------------------------------------------------
}
function getUserToggle( $tog ) {
- return wfMsg("tog-".$tog);
+ return wfMsg('tog-'.$tog);
}
function getLanguageNames() {
global $wgUser, $wgLocalTZoffset;
if (!$tz) {
- $tz = $wgUser->getOption( 'timecorrection' );
+ $tz = $wgUser->getOption( 'timecorrection' );
}
if ( $tz === '' ) {
}
function date( $ts, $adj = false, $format = MW_DATE_USER_FORMAT, $timecorrection = false ) {
- global $wgAmericanDates, $wgUser, $wgUseDynamicDates;
-
+ global $wgAmericanDates, $wgUser;
+
$ts=wfTimestamp(TS_MW,$ts);
if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
- if ( $wgUseDynamicDates ) {
- if ( $format == MW_DATE_USER_FORMAT ) {
- $datePreference = $wgUser->getOption( 'date' );
- } else {
- $options = $this->getDefaultUserOptions();
- $datePreference = $options['date'];
- }
- if ( $datePreference == 0 ) {
- $datePreference = $wgAmericanDates ? 1 : 2;
- }
+
+ if ( $format == MW_DATE_USER_FORMAT ) {
+ $datePreference = $wgUser->getOption( 'date' );
} else {
+ $options = $this->getDefaultUserOptions();
+ $datePreference = $options['date'];
+ }
+
+ if ($datePreference == '0') {
$datePreference = $wgAmericanDates ? 1 : 2;
}
$month = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) );
$day = $this->formatNum( 0 + substr( $ts, 6, 2 ) );
$year = $this->formatNum( substr( $ts, 0, 4 ) );
-
+
switch( $datePreference ) {
- case 1: return "$month $day, $year";
- case 2: return "$day $month $year";
- case 4: return substr($ts, 0, 4). '-' . substr($ts, 4, 2). '-' .substr($ts, 6, 2);
- default: return "$year $month $day";
+ case '2': return "$day $month $year";
+ case '3': return "$year $month $day";
+ case 'ISO 8601': return substr($ts, 0, 4). '-' . substr($ts, 4, 2). '-' .substr($ts, 6, 2);
+ default: return "$month $day, $year";
}
}
if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
$t = substr( $ts, 8, 2 ) . ':' . substr( $ts, 10, 2 );
- if ( $seconds || $wgUser->getOption( 'date' ) == 4) {
+ if ( $seconds || $wgUser->getOption( 'date' ) == 'ISO 8601' ) {
$t .= ':' . substr( $ts, 12, 2 );
}
return $this->formatNum( $t );
}
-
+
function timeanddate( $ts, $adj = false, $format = MW_DATE_USER_FORMAT, $timecorrection = false, $dateandtime = false) {
global $wgUser;
$ts=wfTimestamp(TS_MW,$ts);
- if ( 4 == $wgUser->getOption( 'date' ) ) {
- return $this->date( $ts, $adj, $format, $timecorrection ) . ' ' .
+
+ switch ( $wgUser->getOption( 'date' ) ) {
+ case 'ISO 8601': return $this->date( $ts, $adj, $format, $timecorrection ) . ' ' .
$this->time( $ts, $adj, false, $timecorrection );
- } else {
- return $this->time( $ts, $adj, false, $timecorrection ) . ', ' .
+ default: return $this->time( $ts, $adj, false, $timecorrection ) . ', ' .
$this->date( $ts, $adj, $format, $timecorrection );
}
}
dépôts / lhc / web / wiklou.git / blobdiff